Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Mon, 22 Mar 2010 07:34:25 +0000 (08:34 +0100)
committerJan D. <jan.h.d@swipnet.se>
Mon, 22 Mar 2010 07:34:25 +0000 (08:34 +0100)
commit42a0fae62dcbe57eab2846f49c11794017b5c542
tree6a0a96277d076f654d4508820c64ab1677418651
parenta009fbdae97ad76b3eb59c5bd85295c76c355382
parent912341978fec5028789fbc101c687651887ade6c
Merge from trunk